minor style tweak and fix #15