:golf:
Merge pull request #17 from sue445/fearure/refactoring

:golf: