Yeah. This part can be cleaned. I will try to update this before the merge.