Refactor to clean up names.