moar spacing cleanup