Further style tweaks. Solid version to work with.