Moved class-variables to class Piece