Some cleaning and fixing.