Cleaning

improves #1