Small refactor
Working on specs