Language cleanup

Clean up a bunch off small language nits