clean up, minor changes