Refactored module for simplification
Added reset on playlist change