Cleaned up formatting in Core.TypeWrappers