Issue #2354513: Tax / Shipping Columns not populating

Also implemented better Drupal coding standards