Fixed Some minor Bugs
Removed Unused Imports