a bit o cleanup