Code cleanup
Merge pull request #8 from Herrie82/herrie-stable

Code cleanup