Fixed type and formatting