More code formatting and consistency changes.