Cleanup

Removes two c++ warnings. Improves documentation.
You are right. I try not to change the style of a file usually, but in this case there were different styles mixed, so I chose one.