More insignificant and minor style changes