added missed privates vars
simplified accessor methods