performed some cleanup and removed unused imports