Use getInstance instead of new object on heap
Optimizing imports
Major code reformatting