House cleaning

## v0.1.2510
## for Issue #41