[Misc] Minor code cleaning.
[Misc] Minor code cleaning.
Merge pull request #243 from gdelhumeau/misc

[Misc] Minor code cleaning.