Cleanup, minor content changes