Cleanup ; Optimized imports.
Merge pull request #18 from PierreLvx/master

Typos
Merge pull request #19 from PierreLvx/cleanup

Cleanup ; Optimized imports.