More stylistical fixes