Removed unnecessary import and added a comment or two