conforming to style guide and reducing nesting
removing gemfiles for merge
Merge branch 'staging'

Updating to better match style guide