documentation cleanup + ordering