.
.
OOP
.
minor formatting/naming fixes