Refactoring/formatting