Fix current rubocop complains