Minor changes and cleaning