[playtvak] Improve and simplify