hot syntax and formatting fix