Refactoring/styling