Code tidy before moving xWords to separate repository