Refactor.
Merge branch 'develop' of github.com:pragmadash/catberry into develop