Few corrections (comments, unused import ...) before the pull request.