Refactored NNs