stylistic changes from tspurway