Refactoring some variables