Small code tidy

Change-Id: Idec03f8fa2dfb7f5ad6f0a5b0c846d4dc1d3cc4d