Some more formatting and styling
Got rid of some rspec generated tests