Better coding

[pedronveloso]

I made this changes in a separated branch because I will be using parts of this project in one of my own. I had made some code fixes and general cleanup and decided to made a contribution back. If you don't want new branch or all of my changes just do a manual merge, there's some stuff I think you'll find useful there.

Cheers