OOPS
Refactor
Merge pull request #13 from sue445/feature/refactor_test

Refactor