Issue #2841021 by anand.toshniwal93, Yogesh Pawar, navneet0693, rahul01: Clean up code for admin configuration form