Turn an else if into an elsif. Remove unnecessary return.