Some simple changes to language. Code cleanup.