various clean up improvements
various clean up improvements