Fix it & Improve it

Verified by MonsterInsights