code cleanup
Merge pull request #15 from vicb/0603-clean

code cleanup