formatting and premature  refactoring