Ack refactoring