Revert 451416e..82d74f3

This rolls back to commit 451416e80d109be2e88e480373d6ae2227eb6109.
refactor private properties in correct way