Some code formatting refactorings