Added some comments, made blocks out of some inline if's.
Persist static arguments.