Reorganize to have all the code to be modified manually in one spot