renamed checker and minor cosmetic code changes