Clean up fail callbacks, use underscore