Optimize import statements
Add @ExpireUnhandledExceptions annotation
All refactorings done prior to constructor
Refactored constructor