Updated : remove command line buffer, format airline