Overhaul on less variables, making it look nice and work