Yeh, let's go for that and inline the vars.