more type cleanups