Various style amends