Added transformation of Choose methods
Cleanup