Optimize and update package name
Formatting