indent, variable moves

Talked to Brook, made some more changes for clarity