refactoring/formatting