#138 refactor properties and default value.
#72 review