Removed some useless variables & general cleanup and coding style
nitpicking.

Change-Id: Ie609f38596bf1b2cd438d540fdee3166ff768bee