Implemented wording comments by @keflavich