Fixed coding style with 2 tabs and comments.

Signed-off-by: Huy Bui <huybui@anl.gov>
Merge remote branch 'huy/master' into energy