trying to fix up whitespace issues to match original changes