- Minor refactoring of TinySimulator