Some minor aesthetic changes