Fixed some rubocop things. Going to commit now, in case i break something