cleanups from feedback