Rewording and fixuping all commits to hide ugly git history