Style tweaks from Geer