Fix some styling issues, remove some old and irrelevant comments.