style tweaks and tests