Made the code more readable in various ways such as renaming field and method names, adding braces to if statements etc.
Authored by: dcaffrey 2023-04-28
Parent: [r1738]
Child: [r1740]
