more spacing and re-arranging if