Terminal interface cleaned up