format and comment change to discriminate workaround parts of code