Reformat && refactoring