StateMachineFeat review fix
Fixed code standard issues