style refactoring
minor code style changes