Added Bike Container and Refactored