a ton of stylistic changes
bumps version to 2.2.2
Merge branch 'develop' for version 2.2.2