formal cleanups