Clean up, organization, optimization
working callbacks
back to the last working state