Finish rspec and clean code