Refactored ICPC