more polish / unstupidify edits.