'followed the style guide'
Merge branch 'auth' into dev