refactor: cleanup conditions