Format cleanup 1#25

JSchripsema-IDM merged 4 commits into

Generic-OngoingEMOD-Hub/EMOD-Generic:Generic-Ongoingfrom

format-cleanup-1EMOD-Hub/EMOD-Generic:format-cleanup-1Copy head branch name to clipboard