Cleaned up Unit/Type