Refactor: Change code style
Update package