Fix layout (zas comments)

Note: Whilst the previous indentation of "and" was incorrect as per
PEP-8, I think it was actually more readable.