Small changes: renaming properties, refactoring