cleanup whitespace in #1197, remove unnecessary if