cleanup and style tweaks