Address dain's review comments