A bit of clean up, and commenting