Issue #2789983 by hampercm, shruti1803, aks22: Make code compliant with Drupal coding standards and best practices