More cleanup
Description and a bit of cleanup