Coding style tweaks & removed one unused variable from the setup file.

Change-Id: Ia523e2e9cbf374a5feb357290218ebb276652664