Reordered variables and removed unused comment.