Bump Version to 0.7
Fix typos and refactoring acourding to PR's comments