Change structure of termin and refactor condition on printing...