Reports 199a: Code clean up