Finished refactoring.
Refactored value for readability.
Merge pull request #9 from ricomoss/refactor

Refactor for clarity