Still some minor style changes