CLI Play function cleanup (fixes #82)