refactor - clean player code