minor rspec, formatting, and todo cleanup