Minor corrections and clean