More small refactorings formatting