Before formatting

Need to reformat to add back annotations