Improvements based on Sonar results.
Merge branch master of git://github.com/tibistibi/mTor.git
Merge branch master of git://github.com/tibistibi/mTor.git