ENH: Better logging
FIX: Py26
STY: Cleaner