Implement it Tidy

Change-Id: I51a201e4eda9a2a2155a2f82b87b56e7eff62164