where possible. Avoids some string copies. Also re-indent some stuff. Also some indent fixes here and there.