Minor - format code.
Minor - adding category code. See BT#8885