Refactoring and video start/stop