Small changes to data structures for pyenergy