language cleanup. Closes #259