Refactor var name
Remove some packages from local list