Completed refactor
Merge pull request #1 from haneefghanim/refactor

Completed refactor