Cleanups from review