Conventions part
Modifying Conventions disposition and adding some name of possible improvements
Merge remote-tracking branch 'origin/master'