added code refactoring
commiting refactoring