class: Minor changes, removed unused imports, fixed code comments