Style improvements and key checking simplification
Further style improvements
Merge pull request #2091 from arcz/master

Style improvements and unification