clean up plan
elaborate plan a bit