Refactored terminal apps for more consistency