Moved watch declarations into single functions