Made some aesthetic changes