Refactor after first Spec pass