Clean Code

Change-Id: I579d21fd97c0621c58ec28ed7c79bbdd2916baa1