Better names and a bit of cleanup.