Refactored code that removes dumb var aliases