Cleanup, renamed G5.typof into G5.type_of