Update code for Rubocop, improve helper