Formatting
Formatting and removal of errant puts statements
Format blocks properly
Initial cleanup of specs
Additional formatting