I understand that in this part you only have fixed indentation and variable declaration order, right? It's a bit difficult to follow in the interleaved diff at github.com :)