Revert "Merge branch 'migrations' of https://github.com/yousraHazem/Topsoft-14 into migrations"

This reverts commit 90170d001b74d3fc77d0c2353543d04eadc7ad8b, reversing
changes made to 9080c40a2c7f22a742633845d0f0a8000ce195ce.
Issue #285 fix code conventions