Simplify a bunch, fixes an issue where state var would be in a bad state and youd get a false positive for a device if another is triggered