Cleaned things up, use curses