Cleaning and style changes.