*** Spec, Refactor & bump version