More files have been simplified and prettified, thanks to our friend Blob.