Turn text updates accordingly
Removed duplicated code
Merge branch 'master' into Hugo