More Refactoring
fix missing var initialization