- fix formatting issues and use loc strings for comparison