Iniital round of wholesale changes to better reflect recent changes to coding practices