Further neaten mc player code.