cleanup / refactoring
Merge pull request #5 from vicb/cleanup

cleanup / refactoring