Using the correct code style for variable name and removing unused imports.

Signed-off-by: David Marques <dpsmarques@gmail.com>