Make these core classes really in "class". also small refinement on doc format