type cleanups