Changed to Unit Type and Cleaned it all up