FYI this is just a reindenting after merge conflict. We indent gems everywhere, I wanted to keep this until we do a proper review.