Fix white-space lint issues