3rd try to clean
Merge pull request #11 from CoinEXchange/cleanup1

3rd try to clean