small refactor, changed a method so we only need to call 1 variable. used if instead of && everywhere (makes more sense to me, doesnt matter to me if you change it back though)