Minor cleaning and fixing.