ticket:9 fix few style issues in code