Refactoring; renamed variables