Small changes and polishes to the style