Style formatting and changes (normalizing a bit)