Refactor some variables