Refactor code after fixed AOI optimizing with InteljIdea