Style tweaks, normalizing