Minor style updates
Merge branch 'refs/heads/master' into Feature/AngularBackend