Minor
Comments
Style refactoring