Corrects more stuff as per rubocop