Code tidying after running PMD.