Refactored package.json scripts