Making everything look more coherent, style-wise.