Refactor : better presentation
Remove unnecessary dependencies
Merge remote-tracking branch 'upstream/master'