more string externalization; more pep8