Fix formatting and string comparison