Fix all the spacing