Refactor perfection checks
Simplify setup tracking