Refactoring of names of several properties.
Code style changes.
Code style changes.
Code style changes.