Clean up style definitions. Minor tweaks