src cleaned up.  rawrgh