Update indentation and remove unused variables

Change-Id: I3d974f35ceeb85b0ab9c96fe6c0f24233219c7c9