refactor: CA and consistency