making some changes
refactoring
refactoring