some clean ups
Merge pull request #5 from cordoval/5-clean-up-by-cordoval

clean up by cordoval