[Clean] Reduce code violations.
[Fix] From Feedbacks.
Merge pull request #104 from jmpascal/master

Clean and quick fix from feedback