We cant the code to be easier to maintain
Merge pull request #1 from Custodius/cleanup

We cant the code to be easier to maintain