Nits and cleanup.