Tidying up watch command