fixing comment and imports