@yuhunglin completely agree but only changed a few characters here. Will refactor a bit in the next sweep.