include distance kilometer to clubwork statistics and slightly restructure code