Add more alternatives and clean up.