Some Refactors now that Rspec Tests are Green