Refactored files for bikes broken and fixed