Refactor: Change variable name to be simple
Restore data when starting
Refactor: Rename function to be specific
Update package