partial cleanup of Bastien Gorissen's code:

- don't use 'this->' unless you really need it
- don't use 'using namespace std'
- don't put extra ';'s everywhere
- follow the style of the rest of the code for indentation, etc.