Refactor. Remove type struct code.