Changes to improve consistency in code.
More code consistency improvements