some autodescribe refactor.