Minor refactoring
Reformat code
Reformatting