Cleaned up output echo alignment