Add Journey to Work and a little more clean up