-Remove underscore variables in preperation for internationalization