[enh] fix pep8, improve syntax highlighting