Fix white space weirdness, consistency