A bit more minimalistic style changes.