Full code review

Full code review
Removed unnecessary import statements and used only the necessary ones.