SRC: Refactor onSuccess handler.