Bike refactored