More fixes to code styling and naming conventions.