Make a few simple improvements