closed issue #1 - Some cleaning needed