Parameter and CSimulator files tidied up