Cleaning up spacing a little more