Code wrap cleanups