Minimal refactor