Fix cyclic assist

Also normalizes whitespace and comments where applicable.