starting rubocop cleanup
fucking rewrite almost complete