Cleaned up the terminal interface