Cleanup. Fixing callback error. Indention.