formatting/refactoring