various style tweaks and cleanups