Small style tweaks and clean up