Started spacing cleanup