C'mon.

Massive edit for peer code review.