Translator: Tidy up source