cleanups from pr comments