Removed out-commented code.
Added more class documentation.