cleanup of comments and PEP8 formatting, after merge from gopal implementing english and a choice of languages