admin cleanup & refactor