Refactor a1