Merge pull request #10 from cordoval/10-clean-up

clean up
minor
couple last ones