Renaming for more clarity, minor refactor.