Stylistical fixes