Improve package schema and criteria field

PEP8