code cleanup
rspec awesomeness