Reformatting, fixes for our case.