added ability to make Picker instances
cleanup, naming, organization