fixed import errors and removed unnecessary comments