Fix classmap,
Shuffle doc comment