edited the format of everything