rspec
fix and cleanup