Refactored some variables