Made some refactorings to MAFA-11 and MAFA-12 based on advice from Andy

Signed-off-by: unknown <cnwnh1@cnwcb5a.cnw.co.nz>