#5: fix default value
#5: small refactor