Improved some comments.
Removed some dead code, improved comments