fix #24 : comment and clean this code