Made spacing more sane