Style tweaks from @boboroshi