Complete review to fit with advises provide

thank to @petebacondarwin and @pkozlowski-opensource