Fix spacing once and for all