Ack refactor