Another refactor
Start codeschool rspec tutorial