Tidy up and lang files