Code cleanup, minor polish, minor changes, etc.