Optimize "Manage Your Energy" solution a bit