Fixed callbacks.
Fixed callbacks. Code clean-up.