Just random code changes ...