cleans up journey, feels better, first test looks a bit better