Fix whitespace and watch for scope changes