Adds mostly cosmetic and slight structural changes