Rubocop: Cleaning up helpers
Merge pull request #2860 from daviddavis/temp/20130831082813

Rubocop: Cleaning up helpers