Refactor to coincide with mutator access.