Made a number of aesthetic changes