Some cleaning
Merge pull request #32 from NFM-8/master

Some cleaning