`deparse` refactoring

Based on @kmsquire's gist: https://gist.github.com/kmsquire/7407973
Merge pull request #32 from magistere/update

`deparse` refactoring