Added/changed some comments for all classes and methods, and removed
unused imports.