changed access from propeties to private
Refactored code