pmd fixes in CharacterController
pmd fixes in ClientController