Final changes for Iteration 1 and remove spec_helper from Rubocop