used rubocop, did some cleaning