Clean up code
Get first spec running