ENH: changes according to comments