Can we change this to follow the PCL coding style conventions please?