Fixed minor formatting issues of comments and two import errors.