Some slight renaming for clarity, only expose necessary helpers to view, and some cleanup.