Code clean-up. Fixed language variable errors.