Refactored code.

Removed redundant class and optimized imports in the code.