refactoring, formating changes