Fix white-space related lint issues