Tidy First

Apply Kent Beck's "Tidy First?" approach — small structure changes (tidyings) separated from behavior changes, sequenced as "first / after / later / never", informed by software design as an economic activity (coupling, cohesion, optionality, discount rate). Use when about to make a behavior change in messy code, when reviewing a tangled PR, when deciding whether to clean up now or later, or when thinking about software design as a long-running investment decision rather than a craft aesthetic.

5 stars 2 forksSoftware Development Plugin marketplace

Install

Claude Code plugin
/plugin marketplace add vnovakovits/claude-skills

The repo is a Claude Code plugin marketplace. Run /plugin afterwards to pick the plugin that includes this skill.

skills CLI (Claude Code, Cursor, Codex and more)
npx skills add vnovakovits/claude-skills --skill tidy-first
Manual install
git clone --depth 1 https://github.com/vnovakovits/claude-skills.git /tmp/claude-skills
mkdir -p ~/.claude/skills
cp -r /tmp/claude-skills/plugins/engineering-practices/skills/tidy-first ~/.claude/skills/tidy-first

Personal skills live in ~/.claude/skills. Use .claude/skills in a project folder to share a skill with your team.

From the SKILL.md

# Tidy First? (Kent Beck, 2023)

Apply this skill when standing in front of messy code about to make a change — should you tidy first, after, later, or never? The book's central insight: software design is the *art of structuring options*, and tidyings are small, cheap, reversible structural changes whose timing matters more than their content.

## Core Philosophy

**Two kinds of change: structure and behavior.** Behavior changes alter what the software does — what users see. Structure changes do not. Mixing them in one commit makes reasoning, reviewing, and reverting harder.

**Software design is an economic activity.** Every design decision is an investment. The question is not "is this clean?" but "is the value I expect from this tidying greater than its cost, discounted for time and risk?"

**Coupling and cohesion are the only design concepts that matter.** Everything else is downstream. A change in module A that forces a change in module B is coupling. Things that change together being together is cohesion. The cost of change scales with coupling; the cost of comprehension drops with cohesion.

**Tidyings are small and reversible.** A tidying is the smallest structural change you can make. If a tidying takes more than a few minutes, it's not a tidying — it's a refactor.

**Tidying is optional.** The book is *Tidy First?* with a question mark. Not every mess deserves cleaning; not every clean spot pays for itself. The discipline is choosing.

---
Read the full skill on GitHub

Details

Skill name
tidy-first
Path
plugins/engineering-practices/skills/tidy-first/SKILL.md
License
MIT
Repo updated
16 November 2026

FAQ

What does the Tidy First skill do?

Apply Kent Beck's "Tidy First?" approach — small structure changes (tidyings) separated from behavior changes, sequenced as "first / after / later / never", informed by software design as an economic activity (coupling, cohesion, optionality, discount rate). Use when about to make a behavior change in messy code, when reviewing a tangled PR, when deciding whether to clean up now or later, or when thinking about software design as a long-running investment decision rather than a craft aesthetic.

How do I install the Tidy First skill?

Claude Code plugin: /plugin marketplace add vnovakovits/claude-skills. Skills go in ~/.claude/skills (personal) or .claude/skills (project), and Claude loads them automatically when a task matches the description.

Is Tidy First popular?

It lives in vnovakovits/claude-skills, which has 5 GitHub stars and 2 forks.

Related skills

Accidental Cio

5

vnovakovits/claude-skills

Apply Scott Millett's "The Accidental CIO — A Lean and Agile Playbook for IT Leaders" (Wiley, 2024) when designing or reviewing how a technology organisation decides, funds, governs and delivers work. Covers the five components of an adaptive IT operating model (organised, work, govern, talent, lead) and its four themes (outcomes over output, intrinsic motivation, being not doing agile, manage flow not people); matching method and governance to context via Cynefin and Wardley evolution; governance as demand management + funding + measurement + decision rights, shifting from project funding to

Frontend & Design

Agent Retro

5

vnovakovits/claude-skills

Run a retrospective on a coding-agent session and improve the agent's environment, not the code. Combines Derby & Larsen's five-stage retrospective, Shigeo Shingo's poka-yoke (turn a mechanical mistake into a check that makes it impossible), and Matt Pocock's retro categories — navigation, automated checks, coding standards, steering files, tool economy, information access. Covers mining the session transcript for corrections, wrong turns and slow searches; deciding where each fix belongs (analyzer, hook, CI, reviewer standards, CLAUDE.md pointer, skill, doc or memory); the no-op test for stee

AI, LLMs & Agents

API Design

5

vnovakovits/claude-skills

Design APIs that are clear, evolvable, and idiomatic to their protocol — covering REST (Fielding, Richardson Maturity Model, Massé), GraphQL, gRPC/protobuf, versioning strategies, pagination, error responses (RFC 7807 Problem Details), idempotency, authentication, documentation (OpenAPI), and the pragmatic trade-offs between RESTful purity and developer ergonomics. Use when designing a new endpoint, choosing between REST/GraphQL/gRPC, defining versioning, structuring error responses, deciding pagination strategy, or evaluating an existing API's evolvability.

Software Development

Toyota Way

5

vnovakovits/claude-skills

Apply Jeffrey Liker's "The Toyota Way — 14 Management Principles from the World's Greatest Manufacturer" (2004; 2nd ed. 2021), the management system behind the Toyota Production System. Covers the 4P model (philosophy, process, people and partners, problem solving) and the 14 principles, the TPS house (just-in-time and jidoka on heijunka, standardised work and kaizen), the wastes (muda, mura, muri, unused creativity) mapped to software, and Toyota product development (chief engineer, set-based design, front-loading). Includes a review mode that scores a process, ways-of-working or governance d

Software Development

Test Driven Development

8

Freddy-CHEN-ux/00_claude_skills

Use when adding features or fixing bugs. Follow RED/GREEN/REFACTOR cycle. Write failing test first, implement minimal code to pass, then refactor.

Software Development

Two Axis Code Review

5

vnovakovits/claude-skills

Review a branch or pull request on two separate axes, reported side by side and never merged into one ranking. Standards — does the diff follow this repository's written rules (CLAUDE.md, AGENTS.md, CONTRIBUTING, coding standards) plus a baseline of Fowler's code smells? Spec — does it do what the ticket, spec or plan asked, with nothing missing, nothing extra and nothing done wrongly? Draws on Boehm's verification vs validation ("building the product right" vs "building the right product"), Google's code-review practice and Matt Pocock's two-axis review. Covers pinning the diff to a merge bas

Software Development

Browse the most popular Claude skills, all software development skills, or write your own with the skills generator.