Tightened up console messages