Code cleaning
Merge pull request #8 from devplanter/jack

Code cleaning