Cleans up a lot of code
Writes a bunch of rspecs