Refactor make_bikes