OP-1139: Add some more descriptive names and comments for compensation variables
OP-1139: missing uncrustification