Clean up of a bunch of the type styles