minor fixes to cleanup