Made small changes to clean code.

Change-Id: Id2b23da56c77bfcd8b9336229c688f15b698987a