Refactoring the bikes service