Ben: more cleanup. Yea, less code