follow drupal naming conventions
fix typo
remove unused variables
remove unused variables
follow drupal coding conventions