Terminal modifications

Modified some code for the Terminal class, no functionality was changed.