cleanup implementation.
Merge pull request #10 from Raynos/patch-12

cleanup implementation.