[#60303110] Refactor.
Merge branch 'cop-p2-2013' of https://github.com/vuwfg/knots into cop-p2-2013