Shorter syntax use && for and use || for or
Many "use" statements are useless and can then be safely removed
Simplify the package path guessing.