Code clean for curex plugin