commiting the refactored changes