ENH More verbose output. Better code