Brought code into line with TAC guidelines