Fix package name
Simplify function