Cleaned up the col-* usage of the picklist