Cleanup to resemble airbnb ruby style guide

Not 100% compliant, but better.

Change-Id: I1850d987313c9487395ac6e4f231f6d27afddf2a