Clean comments and echo Statements