More cleaning up of play-trick for readability