Refactoring, reformatting