Cleaning up and adding rspec