Bit of a cleanup. Also seemed to have improved robustness by making data passing cleaner