Better layout (variables were overridable, I was doing it wrong)