Code clean-up
Continue to generate CTMC with error propagations