Admin: refactor