Clean Code

Change-Id: Ib5e63f921dab8f8c976f11f4aa479435afa3f514