Polish up Type code a little.