James C - clean up Type