Got rid of unnecessary import and changed comments.