commiting refactor