Made some minor moves to transition to new struct.