Cleaning up lemmas and names