Remove unnecessary comment, swap local variable for early return