minor cleanup
A bit of encoding.