Stylistical improvement