Refactoring using bitid gem