clean up plan object creation a bit