Reformatting mostly
fixed merge