FIX/ENH: revert changes, improve doc
FIX: 80 characters