Minor code tidy

Change-Id: I691cbfb6b3ac57cd71b8d58611a2afbebcc5012f