refactored some accessors