ticket:1 few style changes in code