Fixed pmd violations in the movement package.