Update to improve indentation with echo