Clean up.
Possibly deprecated spacing function.
Clean up.