changed getters that return optional to getters that return actual value