Cleaned up the public API of the pick and ordering lists