Tidy up
Move to .cc
Fix error