style updates , refactoring