Cleaned up callbacks to pass coder