Organization and style tweaks