Cleanup small things.  Remove print, cleanup indentation.