diff --git a/.fixpackrc b/.fixpackrc
index e6d96ef49..15f4c2bb7 100644
--- a/.fixpackrc
+++ b/.fixpackrc
@@ -1,8 +1,3 @@
 {
-  "quiet": true,
-  "files": [
-    "package.json",
-    "packages/runtime/package.json",
-    "packages/translator/package.json"
-  ]
+  "quiet": true
 }
\ No newline at end of file
diff --git a/.huskyrc b/.huskyrc
index 63e7d66b3..9034361c8 100644
--- a/.huskyrc
+++ b/.huskyrc
@@ -1,6 +1,6 @@
 {
   "hooks": {
     "commit-msg": "commitlint -E HUSKY_GIT_PARAMS",
-    "pre-commit": "lint-staged && fixpack && npm run size:write"
+    "pre-commit": "lint-staged && npm run size:write"
   }
 }
diff --git a/.lintstagedrc b/.lintstagedrc
index 2e773d1e6..5f8fbe5e4 100644
--- a/.lintstagedrc
+++ b/.lintstagedrc
@@ -1,4 +1,5 @@
 {
   "*.{json,md}": ["prettier --write"],
-  "*.{js,ts}": ["eslint -f codeframe --fix", "prettier --write"]
+  "*.{js,ts}": ["eslint -f codeframe --fix", "prettier --write"],
+  "./{,packages/*/}package.json": ["fixpack"]
 }
diff --git a/package.json b/package.json
index 4a5a9da14..076dc3be3 100644
--- a/package.json
+++ b/package.json
@@ -40,17 +40,18 @@
   "private": true,
   "scripts": {
     "build": "lerna run build --parallel",
-    "build:size": "(cd ./packages/runtime && cross-env SIZE=1 rollup -c ./rollup.config.js)",
     "ci:codecov": "nyc report --reporter=text-lcov > coverage.lcov && codecov",
     "ci:test": "nyc --reporter=text npm test",
     "clean": "lerna clean && rm -rf ./packages/*/{dist,debug}",
-    "format": "eslint --fix -f visualstudio packages && prettier \"**/*.{json,md,ts,js}\" --write && fixpack",
-    "lint": "tsc --noEmit && eslint -f visualstudio packages && prettier \"**/*.{json,md,ts,js}\" -l",
+    "format": "npm run lint:eslint -- --fix && npm run lint:prettier -- --write && fixpack",
+    "lint": "tsc --noEmit && npm run lint:eslint && npm run lint:prettier -- -l",
+    "lint:eslint": "eslint -f visualstudio packages",
+    "lint:prettier": "prettier \"**/*.{json,md,ts,js}\"",
     "postinstall": "lerna bootstrap --hoist --no-ci",
     "release": "npm run build && lerna publish",
     "report": "open ./coverage/lcov-report/index.html",
+    "size": "(cd ./packages/runtime && cross-env SIZE=1 rollup -c ./rollup.config.js) && node ./utilities/sizes.js",
     "size:check": "cross-env CHECK=1 npm run size",
-    "size": "npm run build:size && node ./utilities/sizes.js",
     "size:write": "cross-env WRITE=1 npm run size && git add .sizes.json",
     "test": "cross-env NODE_ENV=test mocha -r ts-node/register -r source-map-support/register packages/*/test/{*.test.ts,*/*.test.ts}",
     "test:coverage": "nyc --reporter=text-summary npm run test",