Cleaning

I've added some comments, and replaced a few others.