Added property decorators
pep8