Refactor, fix specs