Simplify tooling