Unify representation of keyword statements
Show variables more usefully
Remove temp variable
Normalise whitespace