Minor code cleanup
Introduce PackageCheckout class
Clarify the description