Fixed refactoring of variable initialization.