Formatting/refactoring