I'll change for to conform to your points (especially the second one).

Not sure it will look like your snippet though (3rd line) ;)