Code cleanup + a bit of documentation for reordering

-> in preparation for more substantial changes

Change-Id: I68657af1efc17be66ab973e0815991d3f1697a1f
1 file changed