Juste some variable refactor