Improve class coherency with local functions