Cleand up passing of variables