Stylistical changes...