Reformatting, running fine so far