Made a few simple improvements