improved rspec, trim some stuff