fix type and formatting