Comments and cleaning

Commented some, cleaned some