Added some minor aesthetic changes