ENH: clean code