Some more code cleanup
Merge pull request #6 from daprog/issue/6

Some more code cleanup