Whitespace fixes in codeblocks -- take two