small cleanups
multipass preparations
multipass