Improvement maintainability of 1.6.4 patcher