Reorganised Sim.cpp (reindent and move of initialiser list to macro)