added utils for player match object selector, cleanup code