Cleanup scoping and calling init