I wonder if we should drop it down into CPlayerController so that it's handled in the next block.  I don't really mind too much, but it makes sense IMO to move all the above block into there, so adding new code there instead of here seems a bit better?

(Purely cosmetic at this stage!)