A small fix a lot of stylistic suggestions

Hi,

I tried to read your code from top down.
Congratulations!

Here's my small contribution.
Some of them are much more stylistic patches that I think made the code more readable (at least for me ;-) ).

Feel free to merge it or not!

Best regards,
Abinoam Jr.