Small clean-up to put in pair with Miguel proof-of-concept

Change-Id: I8f7511005d13b5259fdf6e6c797b971468d4b919