Add missing eq check
Trim trailing spaces