Refactor NaoState (here goes...)