Refactor

Removed return statements in the pieces and some in the GameMaster