Adding a rider object, other refactorings, comments