Adjusting expose statements to reflect best practices