refactored few files
refactoring