Better structuring of variables.