Merge pull request #1 from FrancisGX/refactor

Refactor / update specs