Minor refactoring of the Lattice and Pseudopotential modules