commiting refactored code