Last commit before reformat