more docs
Better class naming