Some simple cleanup, removing old comments.

Generally beautifying the code.