Eva syntax formatting cleanup