Finished comment cleanup; fixes #13.