Clean up code into functions
Ensure if annotated site is not present in file to merge we don't lose sync