Remove comments that are no longer relevant
Clean up white-space. Reword it on line 267