admin modules code cleanup
admin modules code cleanup