Cleaner package definitions