more formatting tweaks

#110, #360