Some code cleanup on the road