refactoring
formatting