Restructure minor style changes