Eval now returns vales (optionally)
Astyle pass