Clean Up

Pear code review.