Cleanup in order controller and model
Started with rspec testing...