Various style fixes, tweaks and improvements