Address ato's review comments