refactored watch, refined styles