More spacing cleanup