[enh] Cleaning code
Fixes #1