Code refactor and speedup - Citadel_30sep OA Question | OAHelper