Small changes to used variables