Various improvements
Style changes
Style improvements