cleanups as suggested