Improved message display; removed logging; general code cleanup