cleaning and small correction