Refactor package fitness