Refactoring added to spec and bike rb