minor changes to cleanup