added properties to getters & setters
code cleanup