Refactor: improving the spec structure