some cleaning and starting with rspec