Cleanup more

use alternate variable names to make things clearer

fix hadoop shutdown time calculation correct when hbase enabled