Simplify code, evaluate tuple

Change-Id: Ic106398359a5055ee97a71ec9b30b15d86e751ca