Restructure a bit and improve prose