Refactor & Lint.