cleanup of spacing