Cleaning up the translator class