Fixing get-comment and removing extra variable