Fixed package name and updated code style