Re-add alert variables removed during rebase
Whitespace fixes
10 files changed