Admin Refactoring (Minor revisions)

Admin Refactoring (Minor revisions)