edited some comment and removed some unused imports