Cleaned up type comments