Refactor-renamed a few things for clarity