Generic spacing cleanup