Cleaned up some echo's