Made some cosmetic chages