Reformat

Here are some changes for legibility of the code.

BTW, what environment are you using? Windows? Linux? Anything else?