refactoring, added getters & setters for options