REFACTOR: Updated variable aliases to not have so much repeated code.