Refactored cyclist a bit more - moved functions to inline.