refactoring and added vba code to repo