Get rid of underline.

* Also clean up whitespace.
* Remove trailing lines.