NPE Fixed ?
Optimize import, and reorganize code