Code tidy

Change-Id: Ib3209da89825301037e1d92a5d84f633fbc67fbd