Small cleanup on accessor