clean up and style tweaks