Fixed handlers initialization (no changes in formatting)