Refactor app code
Refactor specs
Merge pull request #3 from juno/refactor

Refactor