#22 Update and tidy dependency.