Cleaning up some console messages