Fixed lots of comments.

Also removed unnecessary structure and cleaned up.