Rubocop: Cleaning up helpers