Modify files for power_array. Reduse use of self.