Refactoring, formating and renaming