Clean up of types #1