Cleanup specs and refactor a bit - exercises