Cleaning up some old coding styles