A bit tidying up of the cliens source. Got rid of the last IDE warning
too.