Fix two bugs in simulator & code cleaning