Boundaries and refactoring for energy bins
Fix a boundary problem