Clean up echo statement