Slight refactor of energy grants calculator

- Updated next nodes. 
- Updated one of the predicate functions.