some code cleanup
adds annotations
formats rspec output