Some changes suggested by pyflakes

Also reset highlight style to default.