Some slight reworking

Change-Id: If9fe29d17a7eebe3793a3edd56db15fb02947ef1