cleanups
improvements