clean code
better linking and playing