REFACTOR, comment code, move, standardise