Refactoring
Added export and Rename var