cleanup eval statement method
tweak value struct props