Dev Some variable refactoring