class Field extracted enum and class Player small changes