Add class doc comment
Cleanup