refactoring code comit