Formatting and commenting

Just cleaning up before my long migration to another computer.