admin methods code cleanup