Better names and less custom logic.