Code cleanup
Merge pull request #10 from stovocor/reuse

Code cleanup