cleanup branched files in master branch
fix grammar in comments