Cleanup + introduced initCallback