Minor style improvements.

Style improvement, including : 
 - removed some useless includes.
 - changed comment style.
 - compile without warnings.
 - static corectness improved.
 - some braquets and = refactoring.