style changes, refactoring