295475481f
Also small code cleanup and bit more consistency to the commands and variables. Change-Id: I7bb1a9e3bafc105c17010dc145adfb3a166e945e