Edit answer files & refactoring
Refactoring specs
mend