Replace comments with echo statements (logs better)