Stylistic changes to help me sleep at night :)
Merge branch 'dev' into V2