Clean up default
Merge pull request #2 from phuu/clean-up-default

Clean up default