Finish 1.7.2 update, small refactor