updated comments, and removed unused imports