fix #5 + cleaning
fix #3
fix #2