Smartanswers: Energy grants refactoring - Code re-factoring 

https://www.pivotaltracker.com/story/show/70929118