- refactoring and reformat