Successfully refactored code.
Merge pull request #1 from sihrc/refactor

Successfully refactored code.