refactoring/styling