Clean up use of types