Some cleanup in Terminal