Cleaned up the terminal class a lot