Cleanups from comments