Build 22 - Minor tidying up of code