Helper cleanup
Rubocop cleanup