use proper logging strings + minor cosmetic changes