More minor style issues and associated function changes for the past few commits