small type cleanups